Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Sun, 3 Sep 2017 00:50:59 +0000 (20:50 -0400)
committerTom Rini <[email protected]>
Sun, 3 Sep 2017 00:50:59 +0000 (20:50 -0400)

Trivial merge